From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Tue, 2 Aug 2011 15:57:35 +0000 (+0200)
Subject: Prefer port smtp over port 587 when sending mail.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2663
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5a0d6843ca46bad3cdeeb53efe80c1d829a18a52;p=emacs.git

Prefer port smtp over port 587 when sending mail.

* mail/smtpmail.el (smtpmail-query-smtp-server): Try port 25
before 587, since it appears that that's more likely to work for
more people.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index adf8d29b2ba..6376be1ef6c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-08-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* mail/smtpmail.el (smtpmail-query-smtp-server): Try port 25
+	before 587, since it appears that that's more likely to work for
+	more people.
+
 	* cus-edit.el (custom-file): When running under emacs -q, always
 	refuse to save the customisations, even if the .emacs file doesn't
 	exist.
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index cc46660712f..3b406fa9331 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -589,7 +589,7 @@ The list is in preference order.")
 
 (defun smtpmail-query-smtp-server ()
   (let ((server (read-string "Outgoing SMTP mail server: "))
-	(ports '(587 "smtp"))
+	(ports '("smtp" 587))
 	stream port)
     (when (and smtpmail-smtp-server
 	       (not (member smtpmail-smtp-server ports)))